From e6bbc10bd590150be2d7c822d8bd116fd68115e8 Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Fri, 1 Sep 2017 20:17:11 +0100 Subject: [PATCH] ComboBox: Dodge possible surplus disconnects in case anyone connected any other signal on the model to this ComboBox. --- gtk/gtkcombobox.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 5e59260781..c702529a54 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1616,7 +1616,18 @@ gtk_combo_box_unset_model (GtkComboBox *combo_box) if (priv->model) { - g_signal_handlers_disconnect_by_data (priv->model, combo_box); + g_signal_handlers_disconnect_by_func (priv->model, + gtk_combo_box_model_row_inserted, + combo_box); + g_signal_handlers_disconnect_by_func (priv->model, + gtk_combo_box_model_row_deleted, + combo_box); + g_signal_handlers_disconnect_by_func (priv->model, + gtk_combo_box_model_rows_reordered, + combo_box); + g_signal_handlers_disconnect_by_func (priv->model, + gtk_combo_box_model_row_changed, + combo_box); g_object_unref (priv->model); priv->model = NULL; -- 2.30.2